[memprof] Use IndexedMemProfData in a unit test (NFC) #119062
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
IndexedMemProfData eliminates the need for the "using" directives. Also, we do not need to declare maps for individual components of the MemProf profile.
Member
|
@llvm/pr-subscribers-pgo Author: Kazu Hirata (kazutakahirata) ChangesIndexedMemProfData eliminates the need for the "using" directives. Full diff: https://github.com/llvm/llvm-project/pull/119062.diff 1 Files Affected:
diff --git a/llvm/unittests/ProfileData/MemProfTest.cpp b/llvm/unittests/ProfileData/MemProfTest.cpp
index 04e914189c9db9..5e24579baccd37 100644
--- a/llvm/unittests/ProfileData/MemProfTest.cpp
+++ b/llvm/unittests/ProfileData/MemProfTest.cpp
@@ -549,12 +549,6 @@ TEST(MemProf, IndexedMemProfRecordToMemProfRecord) {
EXPECT_EQ(Record.CallSites[1][1].hash(), F4.hash());
}
-using FrameIdMapTy =
- llvm::DenseMap<::llvm::memprof::FrameId, ::llvm::memprof::Frame>;
-using CallStackIdMapTy =
- llvm::DenseMap<::llvm::memprof::CallStackId,
- ::llvm::SmallVector<::llvm::memprof::FrameId>>;
-
// Populate those fields returned by getHotColdSchema.
MemInfoBlock makePartialMIB() {
MemInfoBlock MIB;
@@ -575,12 +569,11 @@ TEST(MemProf, MissingCallStackId) {
IndexedMR.AllocSites.push_back(AI);
// Create empty maps.
- const FrameIdMapTy IdToFrameMap;
- const CallStackIdMapTy CSIdToCallStackMap;
- llvm::memprof::FrameIdConverter<decltype(IdToFrameMap)> FrameIdConv(
- IdToFrameMap);
- llvm::memprof::CallStackIdConverter<decltype(CSIdToCallStackMap)> CSIdConv(
- CSIdToCallStackMap, FrameIdConv);
+ IndexedMemProfData MemProfData;
+ llvm::memprof::FrameIdConverter<decltype(MemProfData.Frames)> FrameIdConv(
+ MemProfData.Frames);
+ llvm::memprof::CallStackIdConverter<decltype(MemProfData.CallStacks)>
+ CSIdConv(MemProfData.CallStacks, FrameIdConv);
// We are only interested in errors, not the return value.
(void)IndexedMR.toMemProfRecord(CSIdConv);
@@ -597,15 +590,14 @@ TEST(MemProf, MissingFrameId) {
IndexedMemProfRecord IndexedMR;
IndexedMR.AllocSites.push_back(AI);
- // An empty map to trigger a mapping error.
- const FrameIdMapTy IdToFrameMap;
- CallStackIdMapTy CSIdToCallStackMap;
- CSIdToCallStackMap.insert({0x222, {2, 3}});
+ // An empty Frame map to trigger a mapping error.
+ IndexedMemProfData MemProfData;
+ MemProfData.CallStacks.insert({0x222, {2, 3}});
- llvm::memprof::FrameIdConverter<decltype(IdToFrameMap)> FrameIdConv(
- IdToFrameMap);
- llvm::memprof::CallStackIdConverter<decltype(CSIdToCallStackMap)> CSIdConv(
- CSIdToCallStackMap, FrameIdConv);
+ llvm::memprof::FrameIdConverter<decltype(MemProfData.Frames)> FrameIdConv(
+ MemProfData.Frames);
+ llvm::memprof::CallStackIdConverter<decltype(MemProfData.CallStacks)>
+ CSIdConv(MemProfData.CallStacks, FrameIdConv);
// We are only interested in errors, not the return value.
(void)IndexedMR.toMemProfRecord(CSIdConv);
|
teresajohnson
approved these changes
Dec 7, 2024
kazutakahirata
deleted the
memprof_cleanup_unittest_IndexedMemProfData2
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IndexedMemProfData eliminates the need for the "using" directives.
Also, we do not need to declare maps for individual components of the
MemProf profile.